(5.4.3) Incremental improvements